Merge branch 'master' of github.com:SiriDB/siridb-server into tasks
authorJeroen van der Heijden <jeroen@transceptor.technology>
Thu, 17 May 2018 09:46:43 +0000 (11:46 +0200)
committerJeroen van der Heijden <jeroen@transceptor.technology>
Thu, 17 May 2018 09:46:43 +0000 (11:46 +0200)

Trivial merge